Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge maintenance/MPS-2022.2 into maintenance/MPS-2022.3 #82

Merged
merged 49 commits into from
May 17, 2024

Conversation

mps-ci-buildbot
Copy link
Contributor

Merge changes from maintenance/MPS-2022.2 to maintenance/MPS-2022.3.

danielratiu and others added 30 commits December 20, 2023 10:45
…lugin com.mpsbasics.testutils for it and the test class
base.tooling: fixed ProjectHelper
… menus for FASTEN

build.gradle: enable installation of actionsfilter into MPS\plugins directory
…ntenance/MPS-2022.2

# Conflicts:
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/com.mbeddr.formal.safety.tutorial.msd
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._020_hazards_and_risk_analysis/_010_airbag_controller_functional_control_structure.mpsr
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._051_structured_assurance_cases_doc/_015_cross_referencing_goal_structure.mpsr
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_cae/Safety Requirements Are Well Defined.mpsr
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_gsn/_010_pattern_instantiation.mpsr
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._070_assurance_cases_linked_to_artifacts_models/_100_top_level.mpsr
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._000_hara.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._010_scenarios.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._100_safety_case.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/_010_uber_atg_safety_case_top.mpsr
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/models/doc.mps
#	gradle.lockfile
formal.base: moved the screenshooters functionality to mpsbasics
@danielratiu danielratiu merged commit 8b17032 into maintenance/MPS-2022.3 May 17, 2024
6 checks passed
@danielratiu danielratiu deleted the merge/MPS-2022.3 branch May 17, 2024 16:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants